Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix LCARS menu and improve header.php #2268

Merged
merged 3 commits into from
Jul 26, 2022
Merged

Fix LCARS menu and improve header.php #2268

merged 3 commits into from
Jul 26, 2022

Conversation

rdwebdesign
Copy link
Member

Please make sure you

  1. Base your code and PRs against the repositories developmental branch.
  2. Sign Off all commits as we enforce the DCO for all contributions
  • What does this PR aim to accomplish?:

After #2266, the new menu design wasn't working as expected in LCARS theme. The menu HTML and CSS theme needed a few adjustments.

Also, there was a lot of code in file header.php.
This code was moved to sidebar.php and to new functions in func.php.

  • What documentation changes (if any) are needed to support this PR?:

none

By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  • I have read the above and my PR is ready for review. Check this box to confirm

@rdwebdesign
Fix LCARS menu (add grouping headers)
5ffd903 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Move require "footer.php" to loginpage.php
e79a1d1 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign rdwebdesign force-pushed the fix/lcarsmenu branch 2 times, most recently from b7f131f to 22dea99 Compare July 19, 2022 05:27
yubiuser
yubiuser reviewed Jul 19, 2022
View reviewed changes
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is tough to review...

scripts/pi-hole/php/header.php Show resolved Hide resolved
scripts/pi-hole/php/header.php Show resolved Hide resolved
@rdwebdesign rdwebdesign requested a review from a team July 20, 2022 17:36
@rdwebdesign rdwebdesign force-pushed the fix/lcarsmenu branch 2 times, most recently from c37f4af to 9e1e99a Compare July 20, 2022 21:57
@rdwebdesign
Simplify header.php
79187b1 
- move some functions to `func.php`
- move sidebar to its own file `sidebar.php`
- fix indentation
- LCARS CSS: hide menu headers when logged off
- LCARS CSS: invert hover and active menu colors

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@yubiuser yubiuser merged commit 62fe776 into devel Jul 26, 2022
@yubiuser yubiuser deleted the fix/lcarsmenu branch July 26, 2022 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rdwebdesign @yubiuser